bitkeeper revision 1.1389.5.3 (4277b3d9n4kOkJhg5l2rwlVwgxfYBg)

New files in sparse tree are made via 'obj-y' variable, not 'c-obj-y'.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile
index 11934c626deb04ec5a60d8939e524e47e5ef72ad..48cbb6ddd08985da358e7966c46660c8f678f4be 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile
@@ -29,10 +29,10 @@ obj-$(CONFIG_MICROCODE)             += microcode.o
 c-obj-$(CONFIG_APM)            += apm.o
 obj-$(CONFIG_X86_SMP)          += smp.o smpboot.o
 #obj-$(CONFIG_X86_TRAMPOLINE)  += trampoline.o
-c-obj-$(CONFIG_X86_MPPARSE)    += mpparse.o
+obj-$(CONFIG_X86_MPPARSE)      += mpparse.o
 obj-$(CONFIG_X86_LOCAL_APIC)   += apic.o
 c-obj-$(CONFIG_X86_LOCAL_APIC) += nmi.o
-c-obj-$(CONFIG_X86_IO_APIC)    += io_apic.o
+obj-$(CONFIG_X86_IO_APIC)      += io_apic.o
 c-obj-$(CONFIG_X86_NUMAQ)      += numaq.o
 c-obj-$(CONFIG_X86_SUMMIT_NUMA)        += summit.o
 c-obj-$(CONFIG_MODULES)                += module.o

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile
index 2b658dbd1cac43aa8aae3734a00851be2196b725..a606c3335b32f336afa868d82929435e7a366ed8 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile
@@ -11,7 +11,7 @@ c-obj-$(CONFIG_PCI_DIRECT)    += direct.o
 c-pci-y                                := fixup.o
 c-pci-$(CONFIG_ACPI_PCI)       += acpi.o
 c-pci-y                                += legacy.o
-c-pci-y                                += irq.o
+pci-y                          += irq.o
 
 c-pci-$(CONFIG_X86_VISWS)      := visws.o fixup.o
 pci-$(CONFIG_X86_VISWS)                :=